Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 19 May 2010 22:54:44 +0000 (22:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 19 May 2010 22:54:44 +0000 (22:54 +0000)

Trivial merge